bitkeeper revision 1.1726.2.5 (42ba7c68cP1Z3SmHyVl4grEnN-Yf8g)

minor xense tool updates

Signed-off-by: Steven Hand <steven@xensource.com>

diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index a6d5a390a0e4344342c243ea845e9b4ba0dd904f..e8c82227fea40e261a3e153f1f23a8ee89974da6 100644 (file)
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -124,6 +124,8 @@ tools/misc/miniterm/miniterm
 tools/misc/xc_shadow
 tools/misc/xen_cpuperf
 tools/misc/xenperf
+tools/policy/policy_tool
+tools/policy/xen/*
 tools/pygrub/build/*
 tools/python/build/*
 tools/tests/test_x86_emulator

diff --git a/tools/policy/policy_tool.c b/tools/policy/policy_tool.c
index 696a70c2825d2b445a045f826c1d21ff14def59e..9c2f7a5a5b2371e7f4044b28d259124360dde34b 100644 (file)
--- a/tools/policy/policy_tool.c
+++ b/tools/policy/policy_tool.c
@@ -14,7 +14,7 @@
  *
  * sHype policy management tool. This code runs in a domain and
  *     manages the Xen security policy by interacting with the
- *     Xen access control module via a /proc/xen/policycmd proc-ioctl, 
+ *     Xen access control module via a /proc/xen/privcmd proc-ioctl, 
  *     which is translated into a policy_op hypercall into Xen.
  * 
  * todo: implement setpolicy to dynamically set a policy cache.
@@ -229,7 +229,6 @@ void acm_dump_policy_buffer(void *buf, int buflen) {
        default:
                printf("UNKNOWN POLICY!\n");
        }
-       printf("\nPolicy dump End.\n\n");
 }
 
 /*************************** set policy ****************************/
@@ -519,39 +518,35 @@ usage(char *progname){
 int
 main(int argc, char **argv) {
 
-       int policycmd_fd;
+       int policycmd_fd, ret;
 
-       if (argc < 2)
+       if (argc < 2) 
                usage(argv[0]);
                
        if ((policycmd_fd = open("/proc/xen/privcmd", O_RDONLY)) <= 0) {
-                   printf("ERROR: Could not open xen policycmd device!\n");
+                   printf("ERROR: Could not open xen privcmd device!\n");
                    exit(-1);
        }
            
        if (!strcmp(argv[1], "setpolicy")) {
                if (argc != 2)
                        usage(argv[0]);
-               acm_domain_setpolicy(policycmd_fd);
-
+               ret = acm_domain_setpolicy(policycmd_fd);
        } else if (!strcmp(argv[1], "getpolicy")) {
                if (argc != 2)
                        usage(argv[0]);
-               acm_domain_getpolicy(policycmd_fd);
-
+               ret = acm_domain_getpolicy(policycmd_fd);
        } else if (!strcmp(argv[1], "loadpolicy")) {
                if (argc != 3) 
                        usage(argv[0]);
-               acm_domain_loadpolicy(policycmd_fd, argv[2]);
-
+               ret = acm_domain_loadpolicy(policycmd_fd, argv[2]);
        } else if (!strcmp(argv[1], "dumpstats")) {
                if (argc != 2) 
                        usage(argv[0]);
-               acm_domain_dumpstats(policycmd_fd);
-
+               ret = acm_domain_dumpstats(policycmd_fd);
        } else
                usage(argv[0]);
 
        close(policycmd_fd);
-       return 0;
+       return ret;
 }

diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
index d2219f9668e949a20a442b5ba83751f688b1e620..2b81b06969b02aeb62be8588d05775829d8f990f 100644 (file)
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@ -121,7 +121,7 @@ gopts.var('memory', val='MEMORY',
           use="Domain memory in MB.")
 
 gopts.var('ssidref', val='SSIDREF',
-          fn=set_u32, default=0xffffffff,
+          fn=set_u32, default=-1, 
           use="Security Identifier.")
 
 gopts.var('maxmem', val='MEMORY',